Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 00:58:07 +0000 (17:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 00:58:07 +0000 (17:58 -0700)
commit168faf66aeddf8c1fa69f20acee3bd02d22f775a
tree29885477bde18d3c29c22372bdf6c8a3ad508d9b
parent8dac496b13f776f81669347a14bb0bd75a60f777
parentbca205c4ba74fe640f617eea1d56ac0185a3d3aa
Merge from trunk.
src/xdisp.c